Skip to content

wifi: Upmerge 2 (fixes only) (nrf_wifi) #21296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Apr 8, 2025
Merged

wifi: Upmerge 2 (fixes only) (nrf_wifi) #21296

merged 3 commits into from
Apr 8, 2025

Conversation

krish2718
Copy link
Contributor

@krish2718 krish2718 commented Apr 1, 2025 •
edited
Loading

Latest fixes from nrf_wifi (including FW blobs).

Based on #20438 will be rebased, raised for early CI testing.

@krish2718 krish2718 added this to the 3.0.0 milestone Apr 1, 2025
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. manifest labels Apr 1, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 1, 2025 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
nrfxlib nrfconnect/sdk-nrfxlib@9a7b8e6 (v3.0.0-rc1) nrfconnect/sdk-nrfxlib@ff48bc7 (main) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@e48bca4 (v4.0.99-ncs1-rc1) nrfconnect/sdk-zephyr@a4c6476 nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 1, 2025 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 17

Inputs:

Sources:

sdk-nrf: PR head: 0084e27c104dde0b3f4bac13e9750e00c2ea9f46
nrfxlib: PR head: ff48bc7b0da857911e490a2431fb7a4f6aeba8fd
zephyr: PR head: a4c6476531c1c3054d7ff44b905105aadd47411e

more details

sdk-nrf:

PR head: 0084e27c104dde0b3f4bac13e9750e00c2ea9f46
merge base: ef585d6eb695e75eec446a0feea0f8ed36484b56
target head (main): d8ceca34940c7d7b9b1b2d3ad643a7399a9184b1
Diff

nrfxlib:

PR head: ff48bc7b0da857911e490a2431fb7a4f6aeba8fd
merge base: 9a7b8e6aec3f031b520ff55c658462c748f0ed3e
Diff

zephyr:

PR head: a4c6476531c1c3054d7ff44b905105aadd47411e
merge base: e48bca44dd596dc66d71378e97bf5ceff2c483d0
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (15) 
doc
│  ├── nrf
│  │  ├── protocols
│  │  │  ├── wifi
│  │  │  │  │ debugging.rst
nrfxlib
│  ├── nrf_wifi
│  │  ├── bin
│  │  │  ├── ncs
│  │  │  │  ├── default
│  │  │  │  │  │ nrf70.bin
│  │  │  │  ├── offloaded_raw_tx
│  │  │  │  │  │ nrf70.bin
│  │  │  │  ├── radio_test
│  │  │  │  │  │ nrf70.bin
│  │  │  │  ├── scan_only
│  │  │  │  │  │ nrf70.bin
│  │  │  │  ├── system_with_raw
│  │  │  │  │  │ nrf70.bin
west.yml
zephyr
│  ├── drivers
│  │  ├── wifi
│  │  │  ├── nrf_wifi
│  │  │  │  ├── Kconfig.nrfwifi
│  │  │  │  ├── src
│  │  │  │  │  ├── coex.c
│  │  │  │  │  ├── fmac_main.c
│  │  │  │  │  │ wifi_util.c
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── mesh
│  │  │  │  │ proxy_srv.c
│  ├── tests
│  │  ├── bluetooth
│  │  │  ├── tester
│  │  │  │  ├── src
│  │  │  │  │  ├── btp
│  │  │  │  │  │  │ btp_mesh.h
│  │  │  │  │  │ btp_mesh.c
│  │ west.yml

Outputs:

Toolchain

Version: 7cbc0036f4
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:7cbc0036f4_8bf7ca4353

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 15
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-ble_mesh
    • ✅ test-fw-nrfconnect-chip - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_cloud - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_mosh - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-fw-nrfconnect-nrf-iot_positioning - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-wifi - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
    • ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-sdk-audio
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

richabp
richabp requested changes Apr 2, 2025
View reviewed changes
eivindj-nordic
eivindj-nordic approved these changes Apr 2, 2025
View reviewed changes
Copy link
Contributor

@eivindj-nordic eivindj-nordic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at files owned by ncs-modem team only.

tokangas
tokangas approved these changes Apr 3, 2025
View reviewed changes
Copy link
Contributor

@tokangas tokangas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Verified that Wi-Fi works with modem_shell and location samples (with heap configurations from #20438 applied).

nordicjm
nordicjm requested changes Apr 3, 2025
View reviewed changes
@krish2718 krish2718 changed the title wifi: Upmerge 2 (nrf_wifi) wifi: Upmerge 2 (fixes only) (nrf_wifi) Apr 3, 2025
@krish2718 krish2718 force-pushed the stats_from_memory branch from 16231d5 to 75b615d Compare April 3, 2025 17:56
@krish2718 krish2718 requested review from nordicjm and richabp April 3, 2025 17:58
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 3, 2025 •
edited
Loading

You can find the documentation preview for this PR here.

Preview links for modified nRF Connect SDK documents:

https://ncsdoc.z6.web.core.windows.net/PR-21296/nrf/protocols/wifi/debugging.html

@krish2718 krish2718 force-pushed the stats_from_memory branch from 75b615d to ea80edd Compare April 4, 2025 08:47
This was referenced Apr 7, 2025
Closed
Closed
Closed
Closed
@krish2718 krish2718 force-pushed the stats_from_memory branch from ea80edd to a136b37 Compare April 7, 2025 07:24
@NordicBuilder NordicBuilder removed the DNM label Apr 7, 2025
richabp
richabp reviewed Apr 7, 2025
View reviewed changes
Copy link
Contributor

@richabp richabp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add backport label.

@krish2718
Copy link
Contributor Author

Please add backport label.

Backport already raised #21451 as this is a manifest no auto-backport.

krish2718 added 3 commits April 7, 2025 19:23
@krish2718
manifest: sdk-zephyr: Pull latest nRF Wi-Fi fixes
eb67c25 
Pull latest nRF Wi-Fi fixes:

* Stats from memory
* Coex using both SWCTRL
* STBC and PS-Poll configs

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718
manifest: sdk-nrfxlib: Pull latest FW blobs
bb33530 
Pull 1.2.14.0 FW blobs to NCS.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718
doc: protocols: wifi: Update the table with the new command
0084e27 
Add the new stats variant.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718 krish2718 force-pushed the stats_from_memory branch from a136b37 to 0084e27 Compare April 7, 2025 13:53
@github-actions github-actions bot added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Apr 7, 2025
@nordicjm nordicjm merged commit fa5fc33 into nrfconnect:main Apr 8, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richabp richabp richabp approved these changes

@tokangas tokangas tokangas approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@rlubos rlubos rlubos approved these changes

@nordicjm nordicjm nordicjm approved these changes

@bjda bjda bjda approved these changes

@bama-nordic bama-nordic bama-nordic approved these changes

@eivindj-nordic eivindj-nordic eivindj-nordic approved these changes

@sachinthegreen sachinthegreen sachinthegreen approved these changes

@muraliThokala muraliThokala muraliThokala approved these changes

@D-Triveni D-Triveni Awaiting requested review from D-Triveni

@rado17 rado17 Awaiting requested review from rado17

@wentong-li wentong-li Awaiting requested review from wentong-li

Assignees

No one assigned

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. doc-required PR must not be merged without tech writer approval. manifest manifest-matter manifest-nrfxlib manifest-zephyr

Projects

None yet

Milestone

3.0.0

Development

Successfully merging this pull request may close these issues.